Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <[email protected]>
Mon, 3 Sep 2012 19:22:02 +0000 (21:22 +0200)
committerWolfgang Denk <[email protected]>
Mon, 3 Sep 2012 19:22:02 +0000 (21:22 +0200)
* 'master' of git://git.denx.de/u-boot-ppc4xx:
  ppc4xx: Canyonlands/Glacier: Squeeze NAND image a bit to fit again

Signed-off-by: Wolfgang Denk <[email protected]>

Trivial merge